From d1f5aef12227441b2bfc4ded9b486cdf5151a2af Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 15 Sep 2014 20:29:15 +0100 Subject: [PATCH] flask/policy: use naming convention xenpolicy-$(XEN_FULLVERSION) Daniel suggested we use xenpolicy-$(XEN_FULLVERSION) as flask policy naming convention. Signed-off-by: Wei Liu Cc: Daniel De Graaf Cc: Ian Campbell Acked-by: Daniel De Graaf --- .gitignore | 2 +- tools/flask/policy/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index eeae5fc0bc..d50ff905df 100644 --- a/.gitignore +++ b/.gitignore @@ -271,7 +271,7 @@ xen/xsm/flask/include/class_to_string.h xen/xsm/flask/include/flask.h xen/xsm/flask/include/initial_sid_to_string.h tools/flask/policy/policy.conf -tools/flask/policy/xenpolicy.24 +tools/flask/policy/xenpolicy-* xen/xen xen/xen-syms xen/xen.* diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile index a1c0f11fad..5d8cfbf133 100644 --- a/tools/flask/policy/Makefile +++ b/tools/flask/policy/Makefile @@ -32,7 +32,7 @@ M4 ?= m4 # include the Xen policy type (needed for static device policy). OUTPUT_POLICY = 24 -POLICY_FILENAME = xenpolicy.$(OUTPUT_POLICY) +POLICY_FILENAME = xenpolicy-$(shell $(MAKE) -C $(XEN_ROOT)/xen xenversion --no-print-directory) POLICY_LOADPATH = /boot # policy source layout -- 2.30.2